Skip to content

refactor: Further simplify Makefiles#2073

Merged
google-oss-prow[bot] merged 3 commits intoGoogleContainerTools:mainfrom
Camila-B:cleanup-makefiles
Mar 9, 2026
Merged

refactor: Further simplify Makefiles#2073
google-oss-prow[bot] merged 3 commits intoGoogleContainerTools:mainfrom
Camila-B:cleanup-makefiles

Conversation

@Camila-B
Copy link
Contributor

@Camila-B Camila-B commented Feb 25, 2026 •
edited
Loading

  • Removes deprecated aliases
  • Removes unused variables
  • Creates pattern rule for %-in-docker

@gemini-code-assist
Copy link

gemini-code-assist bot commented Feb 25, 2026

Summary of Changes

Hello @Camila-B, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request refactors the project's Makefiles to enhance their simplicity and maintainability. It achieves this by eliminating obsolete variables and deprecated aliases, and by introducing a flexible pattern rule for executing make targets within a Docker build environment. These changes streamline the build process and reduce redundant code.

Highlights

  • Makefile Simplification: Removed several unused variables and deprecated aliases across multiple Makefiles to reduce clutter and improve maintainability.
  • Docker Pattern Rule: Introduced a generic '%-in-docker' pattern rule in the main Makefile, allowing any make target to be run within the build environment Docker container more concisely.
  • Consolidated Controller Generation Paths: Centralized the 'CONTROLLER_GEN_PATHS' variable in 'Makefile.reconcilermanager' to avoid repetition and simplify future updates for API path definitions.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog
  • Makefile
    • Removed the 'NOMOS_LOCAL' variable.
    • Added a new '%-in-docker' pattern rule to generalize running targets in Docker.
    • Updated the 'test-presubmit' target to utilize the new '__test-presubmit-in-docker' pattern.
  • Makefile.build
    • Removed the deprecated 'build-images-multirepo' alias.
    • Removed the deprecated 'push-images-multirepo' alias.
    • Removed the deprecated 'pull-images-multirepo' alias.
    • Removed the deprecated 'retag-images-multirepo' alias.
  • Makefile.e2e
    • Removed the 'GOTOPT2_BINARY' variable.
  • Makefile.gen
    • Removed the 'clientgen-in-docker' target, now covered by the generic '%-in-docker' rule.
  • Makefile.reconcilermanager
    • Defined 'CONTROLLER_GEN_PATHS' as a new variable to consolidate API paths.
    • Removed the 'generate-in-docker' target, now covered by the generic '%-in-docker' rule.
    • Removed the 'configsync-crds-in-docker' target, now covered by the generic '%-in-docker' rule.
Activity
  • No human activity has been recorded on this pull request yet.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist[bot]
gemini-code-assist bot reviewed Feb 25, 2026
View reviewed changes
Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request refactors the Makefiles to simplify the build logic by removing unused variables and deprecated targets, and introduces a generic %-in-docker pattern rule to reduce code duplication. While these changes improve maintainability and readability, a potential command injection vulnerability was identified in the new %-in-docker pattern rule where the target stem is used unquoted in a shell command.

@Camila-B
Copy link
Contributor Author

Camila-B commented Feb 25, 2026

/retest

@Camila-B Camila-B force-pushed the cleanup-makefiles branch from d930343 to e644807 Compare March 6, 2026 22:30
tiffanny29631
tiffanny29631 approved these changes Mar 9, 2026
View reviewed changes
Copy link
Contributor

@tiffanny29631 tiffanny29631 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@google-oss-prow google-oss-prow bot added the lgtm label Mar 9, 2026
@google-oss-prow
Copy link

google-oss-prow bot commented Mar 9, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tiffanny29631

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@google-oss-prow google-oss-prow bot merged commit bc36b17 into GoogleContainerTools:main Mar 9, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tiffanny29631 tiffanny29631 tiffanny29631 approved these changes

@cowsking cowsking Awaiting requested review from cowsking

+1 more reviewer

@gemini-code-assist gemini-code-assist[bot] gemini-code-assist[bot] left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@tiffanny29631 tiffanny29631

Labels

approved lgtm size/M

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Camila-B @tiffanny29631